Autogenerated HTML docs for v1.3.3-g16a4
diff --git a/git-merge-index.html b/git-merge-index.html index f2235fe..193abe7 100644 --- a/git-merge-index.html +++ b/git-merge-index.html
@@ -353,7 +353,7 @@ fatal: merge program failed</tt></pre> </div></div> <p>where the latter example shows how "git-merge-index" will stop trying to -merge once anything has returned an error (ie "cat" returned an error +merge once anything has returned an error (i.e., "cat" returned an error for the AA file, because it didn't exist in the original, and thus "git-merge-index" didn't even try to merge the MM thing).</p> </div> @@ -372,7 +372,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 05-May-2006 23:14:13 UTC +Last updated 04-Jun-2006 07:24:28 UTC </div> </div> </body>
